splits out gossip CrdsData out of crds_value.rs #3463
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
behzadnouri
force-pushed
the
split-crds-data
branch
4 times, most recently
from
ca2f999 to
4d4be4d
Compare
gregcusack
reviewed
Nov 4, 2024
Comment on lines
+139
to
+176
| pub(crate) fn wallclock(&self) -> u64 { | ||
| match self { | ||
| CrdsData::LegacyContactInfo(contact_info) => contact_info.wallclock(), | ||
| CrdsData::Vote(_, vote) => vote.wallclock, | ||
| CrdsData::LowestSlot(_, obj) => obj.wallclock, | ||
| CrdsData::LegacySnapshotHashes(hash) => hash.wallclock, | ||
| CrdsData::AccountsHashes(hash) => hash.wallclock, | ||
| CrdsData::EpochSlots(_, p) => p.wallclock, | ||
| CrdsData::LegacyVersion(version) => version.wallclock, | ||
| CrdsData::Version(version) => version.wallclock, | ||
| CrdsData::NodeInstance(node) => node.wallclock, | ||
| CrdsData::DuplicateShred(_, shred) => shred.wallclock, | ||
| CrdsData::SnapshotHashes(hash) => hash.wallclock, | ||
| CrdsData::ContactInfo(node) => node.wallclock(), | ||
| CrdsData::RestartLastVotedForkSlots(slots) => slots.wallclock, | ||
| CrdsData::RestartHeaviestFork(fork) => fork.wallclock, | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn pubkey(&self) -> Pubkey { | ||
| match &self { | ||
| CrdsData::LegacyContactInfo(contact_info) => *contact_info.pubkey(), | ||
| CrdsData::Vote(_, vote) => vote.from, | ||
| CrdsData::LowestSlot(_, slots) => slots.from, | ||
| CrdsData::LegacySnapshotHashes(hash) => hash.from, | ||
| CrdsData::AccountsHashes(hash) => hash.from, | ||
| CrdsData::EpochSlots(_, p) => p.from, | ||
| CrdsData::LegacyVersion(version) => version.from, | ||
| CrdsData::Version(version) => version.from, | ||
| CrdsData::NodeInstance(node) => node.from, | ||
| CrdsData::DuplicateShred(_, shred) => shred.from, | ||
| CrdsData::SnapshotHashes(hash) => hash.from, | ||
| CrdsData::ContactInfo(node) => *node.pubkey(), | ||
| CrdsData::RestartLastVotedForkSlots(slots) => slots.from, | ||
| CrdsData::RestartHeaviestFork(fork) => fork.from, | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
unrelated to this exact PR, but why are pubkey and wallclock private in ContactInfo and LegacyContactInfo but public in the other CrdsData types
There was a problem hiding this comment.
A lot of these variants are defined in this same module.
So even if they were private, this code could still access them directly.
| if let CrdsData::NodeInstance(value) = value.data() { | ||
| if let Some(out) = value.overrides(&other.value) { | ||
| return out; | ||
| match value.data() { |
There was a problem hiding this comment.
should we just pass data: &CrdsData into this function instead?
There was a problem hiding this comment.
I think if we pass CrdsData, it kind of obfuscates {ContactInfo,NodeInstance}::overrides api.
Might be more self-explanatory if the api uses a more specific type;
Reorganizing this code in preparation of upcoming changes to CrdsValue (de)serialization.
behzadnouri
force-pushed
the
split-crds-data
branch
from
19b1d9e to
0999629
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
Reorganizing this code in preparation of upcoming changes to
CrdsValue(de)serialization.Summary of Changes
split out gossip
CrdsDataout ofcrds_value.rs